Use _static variants when copying and merging short-lived Pango layouts.

2006-04-28  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkcellrenderertext.c (get_size): Use _static variants when
	copying and merging short-lived Pango layouts. (#340033, Morten Welinder)

diff --git a/ChangeLog b/ChangeLog
index c03069f32b6d0696b0775bde2324f684c8bb6d84..21b30ef4e57f227ac440cb3d75e96b584a467c9f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-28  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcellrenderertext.c (get_size): Use _static variants when
+       copying and merging short-lived Pango layouts. (#340033, Morten Welinder)
+
 2006-04-28  Behdad Esfahbod  <behdad@gnome.org>
 
        * gtk/gtkwidget.c (gtk_widget_create_pango_layout): Fix typo in

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c03069f32b6d0696b0775bde2324f684c8bb6d84..21b30ef4e57f227ac440cb3d75e96b584a467c9f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-04-28  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcellrenderertext.c (get_size): Use _static variants when
+       copying and merging short-lived Pango layouts. (#340033, Morten Welinder)
+
 2006-04-28  Behdad Esfahbod  <behdad@gnome.org>
 
        * gtk/gtkwidget.c (gtk_widget_create_pango_layout): Fix typo in

diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c
index 0029a28620cb7b64d1355440a73173b2bd79d444..a821e1d847fdfa23bc4047a118126941da9f9110 100644 (file)
--- a/gtk/gtkcellrenderertext.c
+++ b/gtk/gtkcellrenderertext.c
@@ -1497,8 +1497,8 @@ get_size (GtkCellRenderer *cell,
       PangoFontDescription *font_desc;
       gint row_height;
 
-      font_desc = pango_font_description_copy (widget->style->font_desc);
-      pango_font_description_merge (font_desc, celltext->font, TRUE);
+      font_desc = pango_font_description_copy_static (widget->style->font_desc);
+      pango_font_description_merge_static (font_desc, celltext->font, TRUE);
 
       if (celltext->scale_set)
        pango_font_description_set_size (font_desc,